Fix for GH#155.