Try to fix dependency issue