Sytemtesting fixing bug (still persists)