Mark role and store bug fixed.