Fix for several inputs