Subject map expansion fix