Bug Fix, but still another one popped up..