Fixing CARBON-14870
Merge pull request #41 from shamrath/master

Fixing CARBON-14870