Better fix Issue #7, still WIP