Fix configuration issus