iFixed #1624 (though it is a bit of a hack).