Fixed issue #44 2. part