Be more strict