Fixed jshin issues