Fixed One Bug.....

Needs testing