Add bug fix for Issue #13
Should fix issue #14