fix bugs!