Fix #1

But that open #2