fixes thanks to sensio insight