Fixing bug generated by merging