Fix bug: Detecting change to Current