Issue #1 - Added test (was fixed in the scope of issue #4