Hopefully fix #1384

Can @madmaxoft comment?