same bug, more fixes