Fix for properties bug