Add queue to prevent bugs