Fixes #26

Can we get rid of the part about -1 and just make it be omit when inapplicable?