bug fixing for release