Bugfix/61 feeding deadlock