hotfixing issue #215