added fix fixes #1 fixes #3

added fix fixes #1 fixes #3