[XX-1022] Added feature

Fixed strange bug

Another bugfix
Merge pull request #1 from AlejoFernandez/chores/xx-1022

[XX-1022] Added feature