Workaround for slow systems #166