Rollback to previous working bug fix