Bug fix for the last upgrade