Extend bugfix for issue 1689 & fix specs
Merge pull request #1904 from stloyd/bugfix/issue_1689

Extend bugfix for issue 1689 & fix specs