See my update comment...