Dirty hack to resolve issue #104