One more quickfix to testing