Third attempt at fixing escape angle computation, it seems to have worked.