actually fix #49 ??