fix based on comment