[actually fix #36]