Fixes KVO bug described in issue #1280

See #1280.