#50 - changes necessary to make river working under ES 1.2