fix pool handling
BugFix for Pooling
Merge remote-tracking branch 'origin/master'