Fixes #2 finally and fixes #4