Issue #44 step #2