jp bug fixed (probably)