Fix #6

Resolves #6