Solution for Bug fix