Bringing in a subtle fix due to jaklaassen