Further Fix for #205