Still trying to fix #528