Address issue Issue #424 -- cliff and meghana