I have finally addressed the glaringly obvious oversight of my previous scheme.