Fixed Issue 66