regression bug due to latest changes