Bugfix, check all