second attempt to fix issue# 2748, plus fix the same problem for the volume/s and spot request/s models as well
Merge pull request #2933 from CpuID/master

second attempt to fix issue# 2748, plus other places its broken