Commiting fix for Timeout Bug