Bug Fixed - Design