Fix/1058

this resolves #1058