issue 207
Merge pull request #212 from Verkalets/fix-always

issue 207