Attempt to fix: #696 - Distributed problem