Fixes class evaluation