Fix for #272 bug.