FIX: addresses #494

Closes #494.