Extend bugfix for issue 1689 & fix specs

Fixes #1689.