fix #25 earlier fix did not work effectively