bug fixing b4 release