fix #63, but introduced by last merged pr