fix 2nd bug too!