Fix draining kiss PP
Merge pull request #1287 from Fuzzysqurl/master

Fix draining kiss PP