fix problem in #680