in fact it is already fixed in master, so please just merge master here, otherwise you create collision