Many things are aligned as expected ( bug fix)