fixed the first bug \o/