Open fix (16/18)

Open fix