Fixed JC-1486 and JC-1339