fix 730 #125; fix multiple 007