temp fix to avoid problems with 10