Another Fix for #205