fixes for #2

okay, I approve this fix.