Fixed another problem related to multiple suites