Bug #854 (clean push)