Fixed stalling bug