maybe fixed a part of #566