Agree with Ralf; people reported a similar issue in Cloud 1.0, so fixing it here won't help us in the long term.