Fixing issue 85
Fixing old issue 68
Fixing old issue 45