Some hot fix