Fixed Dynamic Bugs