#154: fixing bugs