prepared for next bug fix