Fixed issue #25.