Bug fix AESH-252.
Merge pull request #17 from eprogramming/AESH-252

AESH-252.