this need to be fixed in the code