Add new warning and fix a bug