partial fix of #446