fixes #921 overlapping solved