Another hot-fix