Fix for #159