Fixing an issue with the property argument getting overwritten.