Fixed IllegalArgumentException