simplified fix