Fixes: #269.
This should have been included in an earlier commit. (imported from commit 683f3dbbe8730cc588836b7b27a881a50caa284d)