argh! annoying bugs...

Signed-off-by: Suki <suki@missallsunday.com>
Revised code LOL

Signed-off-by: Suki <suki@missallsunday.com>