fixed ordering disrepancies