Actually fix #511 (forgot to commit this)