better message somewhere

also the whole PR fixes #126