added test + fix