make fix work for non directional as well (issue #32)