FIXED: merging issue