Fixed regression because of issue #11.
More tests for issue #11.