Addressed by 51675e5