Okay I can't believe that I'm this stupid. :/ Fixed this in master