And revert a fix which result in a  crash ^^