better fix for 1154