No more mr. nice guy. Fixes #190.