Fix for issue #204.