Fixed S2-009
Merge pull request #1 from durave/S2-009

Fixed S2-009