fix edge-case