Modified for GCC-4.8
Possible Fix
Build Fix