DAR-3303 | Better handling