finishing that bugfix