Fixes #175
Version 2.6.4