Temporary buggy support for properties