Fixing custom models