Hack to fix the 51544 error