This may be causing a double-execute (And thus double-expend-meter) bug