remove hardcoded 0