Ugly hack to fix issue #9