Improve check sign behavior