that should fix #26