Attempt to first #2.
Fixed for #2.
0.4.1