Super awesome bug fix