Fix for issue #148.