Fixes #168 for 1.5