Fixed Copy&Pasta Bug