second attempt to fix issue# 2748, plus fix the same problem for the volume/s and spot request/s models as well