Fixed some bug...

Signed-off-by: cooltimmetje <cooltimmetje@me.com>