updates to fix a very rare but possible edge case