Fixed Breaking Bug