Added new selfcheck.