Maybe fixing an issue