#61 Bugfix/61 feeding deadlock