Should fix #377.