Removed commented code, that was for the case that the new method didn't
work, but it worked:)