Truly fix #377.