add tomasz's better fix