morning bug fixing

morning bug fixing