Fixed minor lockup bug