Fix amount calculation