Fix entry class