Fix saving consumption data
Merge