Quick hack fix for issue #2