Should close #327