Improved dropout handling