Fixed previous merging