Fix for #148
Merge pull request #988 from jmaas/release26

Fix for #148