Open for more bug fixing

Change-Id: I3f933aa2fc6cbd9e0f3ec62e36b3308ffb0b643a