Fix. Closes #1