Merge pull request #268 from tuncer/code-path-regression

Fix #267 (code path regression)