pass #3 - fixing a regression issue