Fix to meet constexpr requirements