Type bug fixed