Fix #3. (hopefully without breaking #1)