One more fix for No access broken markup