Try to fix #37 again