Fix #406

Fixes #406