Some Bug fix