Add the proposal of @chatgris