Vienna deal

Issue 1145