r1218 + fix current VLAN calculation