I'd definitely like some feedback about this. Is there a better way of handling this edge case?