BUG FIXED MOTHAF*KER