Fixed bug: oops, some code misssed