Perhaps this commit might be a better alternative, feel free to choose.