Fixed Issue 62.