Fixes #179 for 1.5