fix to make it work again
Test/Merge of pr/3