made fix based on Jesse's comments on last pr