Modification for good compilation with GCC