Fixing issue with properties