Fix for bind polyfill bug that happened after restructuring the code in last commit