Fix for #216 closes #216