improve my fix #76