Fix issue #94 from main repository