Another fix to my previous changes.