Lazy fix