trying to fix that fucking bug...