Bug fix and max input size changed