Fix for -property enforcement