Bsongis/issue554 trims relative default