Put back max value checking with option this time