proposing fixes