expermintal bug fix