Prepared for dev
Fixed a crash