fixed issues with inputs