Bug fix for gcc v4.8