Quick Fixed Bugs