Really use the right format