Fix: stupid input propblems