fixed regression problems