Package fix

Alternative to #30.

Will fix #27.