Closes issue #442