Wrapping up issue #1277