Maybe this will catch the type better?