Fixes #106

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