To resolve bug issues of previous merge