nasty strange bugfix