temporary edge-case fix