Added workaround/pseudo-fix for issue #6