Fix for #79

closes #79