solves some issues with #736