Fixes #653

Fixes #653