resolves #391, tested and no regression