Fix #564

Resolves #564