Fixed bug found in Matterhorn 1.4