user fix, script fix