modified message and condition of showing
fixed conflict