resolve major bug