[fix] Bug fix for #87