Fixed self restriction