Fixed to enable compilation with GCC