Fix overwritten properties