small fix and clear ipdb [MJ-374]