Still trying to fix this bug...