bugfix³ - not my best day