Fixing property setup.