#206 a tentative fix