issue/#46

fixes #46