Put back types specification since it seems to work now