better queueing; fixes #3