Fix: Now works for all types.
Fix: Now works for all types.