#389 fix