Fixed lockup issue