Fixed Bug Report #4079