Fix Custom Class Properties