quick fix Issue #55