Fixes a possible bug