Proper resolution to #726