Feature/fix feature 181