Fixed poor handling