FUL-81 - Fix bug