issue#394 #388