hack bundle #17

addresses #17