Pattern Bugg Fix