Resolve Bug #4248