Review: Fix #242