Rework charge amount overriding, as it didn't play well in conjunction with volatile property