Fixed Custom Fields Bug