updated for warnings from popcorn 1.3