fixed mixed up shit