bug1190: a bit more sanity