Resolves #39. Also I understood why it broke.