models on handler fix