fixed additional problems

finally ?