Hotfix/108

Part of fixing #108.