Issue #36 Fixs