Should really (really) fix #3