Fixed error due to merge (Part 2)