It looks like this bug was solved in 16.1, but is there a workaround for 16.0? Since there are a lot of users using this versions yet.