Fixed #3, fixes #6