duplicate bugfix gone nigguh!