Fix #1 once and for all