Try to fix #36 again.