I fixed some stuff ticket number 3544