bug fix bodong!