Some fix

Thanks to DougieLawson