Unfortunately this version 15 is deployed in production already and it will be very difficult to fix it :-(