Fixes #1c
Fixes #2
Fixes #2