Fixed 4.5x bug

That's an interesting bug that I'd like to talk about in the next dev meeting. 
However, I'd like that to be merged ASAP as it's pretty critical