fixed vanshil's bug; if around enqueue