Fix region handler issue