Some Bug Fix