But this path throws now a exception while it doesn't before... Not sure this breaks sonething