added #2 fixes #3