Release 2.5.1 minor crash bugfix