Bugfix pretest