fixed for newest versions