Fixed with new input class