print diagnostic on edge case and remove stale TODO