fixing motherfudging introduced bugs