Merge pull request #1 from rszalski/bug_1903

Bug 1903