Fix for that elusive dirty bug..... well ... not exactly a fix... an equally
dirty hack ;-)