reverting previous bug fix, because it causes more bugs