Test and implement corner case, remove redundant fn.