Fixed crash from Jonas commit