Attempt to fix #88.

Changed timeout, order and some logging.