Fixed a crash. New branch will come soon