Temporary fix for property layer