fixed that bug once and for all