Apply https://github.com/toddmotto/echo/pull/35