hopefully corrected bug