Fixed compile error with newer toolchains