extreme mode bug fix