As a separate pull request pls, fixes completely different issue