Update original fix following @Fammy review  code stating if(false) is pretty stupid