Add fix from @lachygroom