Fixing issue 34
Fixing old issue 26