Fix for #156