fix occasional race condition on carousel; work on #518