Should fix #48 for real now.