MAL-83 | Fix patch and add test