BUGS: two more bugs