using egit fixed FINALLY