Supposed to fix #40