Another fix thanks to amtkhdkr