Lagoon Retrofit Solves Short-Circuiting Problems