Fix propagation of properties. Nasty solution, however.