-Werror workaround added