Attempt at fixing circuit