Reverted bug introduced by JOHN