Orders Fixed

Resolves #38