Fixing copy+paste overlooking