Tested for 1.5 fixes #2