Fix for an Issue #488