Solution not works add a fix on that