Fixed the Problem I introduced in my last commit