One more update for NDEBUG