Dinamic Bug fix!