Fixed Issue 462