Fix #1 as far as possible