Get stricter 2

As before. Do not send in pull requests like these. They will be closed and not merged.