Partial fix of the multihandling