Fixed lingering issues after the division