fix non-string support