Still issue #180. Can break anything as it is, needs testing.