Fixed bug in last commit (merge bug)