Bug #854 (clean push)

Pull request for bug #854