Temporary hack to allow tests to finish (will be removed when solution is found)