fixing my own