Fixed Bug &