Fixes Issue #107

#107