Quick and dirty fix for issue #43