more bugs argh!