* fixed Github Issue #36 (reported by opax)