Last commit only fixed half of the problem