Fixed on argument incorrect handling