Patch that fixes this porblem