Edited semantic analysis to avoid problems with access