Added on the fly corrections