Maybe fixed a race condition - supplying still doesn't work