More and more bug-fixes

Why am I not writing tests?