diff --git a/Elevator/Elevator.c b/Elevator/Elevator.c
index c8d3538..cf89e32 100644
--- a/Elevator/Elevator.c
+++ b/Elevator/Elevator.c
@@ -69,7 +69,7 @@ int get_next_floor_Elevator(THIS(Elevator)){
 		temp_element = this->passengers->get_element(this->passengers, i);
 		temp_passenger = (Passenger*) temp_element->get_data(temp_element);
 		temp_floor = temp_passenger->type == RESIDENT ? temp_passenger->resident->destination : temp_passenger->visitor->destination;
-		if(abs(this->floor - temp_floor) < min_diff){
+		if(abs(this->floor - temp_floor) < min_diff && temp_floor != this->floor){
 			min_diff = abs(this->floor - temp_floor);
 			next_floor = temp_floor;
 		}
diff --git a/residents.txt b/residents.txt
index cc39648..3e52fbd 100644
--- a/residents.txt
+++ b/residents.txt
@@ -4,4 +4,4 @@ Bro;1;1
 Ation;1;3
 Anium;1;3
 Lyne;1;1
-Crack;2;2
\ No newline at end of file
+Crack;2;2