Enforcing some politeness - fixes #14