Fixing issue 82
Fixing old issue 44