1247 propertychangefired bug

Fix for #1247 with spec