fixes #1
fixed #2