BadArgumentCountException added, temp fix