Tried to fix https://github.com/finnle/ITS-2.0-Testsuite/issues/15