working hard code fix