[fix] Bug fix for #95
[fix] Bug fix for #93