Fixed something that got broken in the merge :(