default geometry moved to else clause

to allow override