Moved warning to helpers