Closes bug #1662