Fix for #146