Still trying to fix that bug...