#25 another fix