Temporaly fixed crashes :P