Fixed Issue 98