Fixing based on comments