Fixed a bug that occurred after fixing previous merge conflict