temporary solution for issue #70