Fixes classes returning