Fixes 60d7997e0233d8aee833dab5c7b5c14df124dd16 commit