Working fix

A little ugly but this work