trying to fix #89, but encountered #90