More generalized fix