Temporary crashfix
Fixed the release version
Merge branch 'Robbin'