Fixed prev commit (6)