hack to mask issue #86