Fix for #195