fixed comfy for edge cases