Another fix for static_assert