Missed some checks :|