Fix #2928
Merge pull request #2929 from Just-m/JM-20141305

Fix #2928