Fix for generic-1