PR - Fix to #34

Fix by @AdrianSkierniewski on #34