Fix for invalid property names