fix endless sleep by moving skipping logic