Fixes #417
Release v2.5.1