Fixed some strictness