Make last commit more clear and robust