bla bla bla fixes #1 fixes #2 refs #3