crash during version control - started to fix the issues again