Thanks to Matt Kraai <kraai@ftbfs.org> for the patch!