Fixed InputSet implementation errors