re #25 - porting the change to 0.3-alpha1