issue/#434 and issue/#464

fixes #434