Compilation under gcc4.4 fixed