DAR-2706 & DAR-2703 | Bugfixing