fixed #2: slightly better