Fix for #117