FIX: cleaned up unmerged warning message