fixed bug 1223922
Merge pull request #1701 from Justinha/01222014Working

fixed bug 1223922