Sume bug fixing while waiting for Robertof's MEGACOMMIT®