Finished fixing #841.