minor changes
Try to isolate backwards-bug