bug fixed, getting rid of warnings