Fixing #11
This is partially pulled from mzimmerman/goon change 530e947915336c9b0e423ac1da618811e2651ed8