Fix for #122