incomplete bug fix id 55

added "#TODO"