Adding $ before tabspace in echo, added waiting lock parser