some Bug fix