Fixes #1 and Fixes #2