modification(by Levente) to solve the problem in the QA mentioned in the bug report...