Fixed issue #9 by simplification