Reduced the effort for restriction checking, #47