multiple fixes