Warn users
Fix kevin's merge :boom: