fix based on khaled feedback