Fix for Issue 468