Fixing rental flow