fix a little more