Fixed the bug but there’s still another bug we think