Added a fix to failing functional test