Oops! Moves value check from comment ctrl to model