BUGS: more bugs