Comment by @ornaart • Hey

Issues fixes! Should be more robust now.