Fix for #198