Fix # 24
reorganise code and message