Some changes, behaviour modified in last commit, so fixed