Update to #1 fix