Fixed unmerged commit