Closes bug #1634