This is the second commit to solve this issue