Fixed Issue #1 - Sort of

SLC Rox