Fixed required. @max107, need code review