Should (REALLY) fix #3