bug fix for other implementations