[fix] Manually merge #405. Fixes #405.