Fixed "first sturt not working" issue