Fixed an unstoppable wave of bugs