Feature/minor fix