Bugfixes:
- Fixed crash