Fix #1, maybe