Catkinization fix