Fix strand issue the right way this time :)