Possible solution for Bug 8 (Not Checked)