Attempt to fix input limitations