solve bugs, thanks nikki