Hotfixes - fixed "ArrayIndexOutOfBoundsException 3" when options are specified.