Restoring reflection fix