Hopefully adresses the invalid property overwrite stuff