Work in progress, just pushed another update to pre release. Will probably run again tomorrow to see if the bug is fixed.