Tried new fix for gcc4.7-lambda-problem