Fixes #168
Version 2.5.2