Small hot-fix