Fix #21 without breaking #11