#94 - remove tmp fix