keijiro Compatibility issue fix