Fix for properties api