Are you planning on fixing this within this PR?