fix from gabster