Nicer alignment
Bug fix
Commit