Fixing custom stuff