Fixes #190 for 1.5