Add fix for end call bug