Fixes #117

Fixes #117.
CC: @hnrch02 @XhmikosR for review