Added explicit types to avoid certain problems.