bug fix for acceptance tests