bugs to #81