Corrected generic case