Version 0.9.8 fixed