fix for current issues