fix: follow what the comments are saying