yet another fix #258