- Hot fix crash in version v0.2.17