Fix for http://yellowgrass.org/issue/YellowGrass/323