Fixes #4 for 1.6-2.5