fix coupled bugs Nikhil found: