fixed bug-fix code >.<