Test and fix #154