Correct settings for Bug #507