Fixed the variable types