Temporary fix for apparent bug with properties in attributes list