Addressing Issue #787

Signed-off-by: M. Colin Blaber <shadow82x@simplemachines.org>