Add in kotarou's patch