Added removal of invalid 0 and 1