This fixes #484 and closes #486.