Close #410 - forge crashes