Removed non-generic case