Possible fixes #144. Hasn't been tested.