Fixed issues with custom command item.