Final fix

I hope this is the last fix caused by maven