Bug #19/ #20, Fix to the quick enhancements for Gill