removed 2 warning cases