this should close #2