This fix acutaly worked, but had a discussion with ISDPL that this is not the behaviour we want