Reorder condition. Resolves #38