Fixed Bugging Issue