Try to fix #37