Fix based on comments