Changed temporary fix, as previous had some side effects