Fix custom class