Fixing stupid mistake
Merge went wrong somewere