Added my own fix