Fixed BAP-2245
Merge pull request #3 from laboro/ticket/BAP-2245

Fixed BAP-2245 - Reviewed