A small fix for non target types