Fix Window bug

Fixes #1