Hotfix/0.9.15

Fix of bug https://www.pivotaltracker.com/story/show/68713846