fix and trivial tuning