Add bug fix for Issue #13