Close #1, everything fixed