Lazy checkout fix