Fixed... or hoped I fixed. See #33