critical fix to the prior commit