Fix for #67 as discussed