Fix terrible bug